bitkeeper revision 1.1159.207.2 (41d3ee2b8X5k263Pk7ShvbMkpcLkMg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 30 Dec 2004 12:01:47 +0000 (12:01 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 30 Dec 2004 12:01:47 +0000 (12:01 +0000)
commit3d866e058558d7a27a07f6ab21049d535d60d736
tree4c15cc41f3c68a8046e1c3fac41e2215f5066218
parenta8406294509338a29a78255080b886fa0c0e8b00
bitkeeper revision 1.1159.207.2 (41d3ee2b8X5k263Pk7ShvbMkpcLkMg)

manual merge
xen/arch/x86/setup.c
xen/include/asm-x86/e820.h